From 211d72e5458212c798c6e66ef6935421a4747d48 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Nov 2017 13:21:24 -0500 Subject: [PATCH] win32: Avoid a screen argument The screen is never used in _gdk_win32_screen_get_setting, so drop it. --- gdk/win32/gdkdisplay-win32.c | 4 +--- gdk/win32/gdkprivate-win32.h | 2 +- gdk/win32/gdkproperty-win32.c | 6 +----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 8488b64b2f..b3b6013f33 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -1205,9 +1205,7 @@ gdk_win32_display_get_setting (GdkDisplay *display, const gchar *name, GValue *value) { - return _gdk_win32_screen_get_setting (GDK_WIN32_DISPLAY (display)->screen, - name, - value); + return _gdk_win32_get_setting (name, value); } static void diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index e8af1ed5f1..b917d65274 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -497,7 +497,7 @@ void _gdk_win32_window_change_property (GdkWindow *window, void _gdk_win32_window_delete_property (GdkWindow *window, GdkAtom property); /* Stray GdkWin32Screen members */ -gboolean _gdk_win32_screen_get_setting (GdkScreen *screen, const gchar *name, GValue *value); +gboolean _gdk_win32_get_setting (const gchar *name, GValue *value); void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen); GdkWindow *gdk_win32_screen_get_root_window (GdkScreen *screen); GdkWindow *gdk_win32_display_get_root_window (GdkDisplay *display); diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index ff902375e5..72059f5c3e 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -28,7 +28,6 @@ #include #include -#include "gdkscreen.h" #include "gdkproperty.h" #include "gdkselection.h" #include "gdkdisplayprivate.h" @@ -344,12 +343,9 @@ _gdk_win32_window_delete_property (GdkWindow *window, */ gboolean -_gdk_win32_screen_get_setting (GdkScreen *screen, - const gchar *name, +_gdk_win32_get_setting (const gchar *name, GValue *value) { - g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); - /* * XXX : if these values get changed through the Windoze UI the * respective gdk_events are not generated yet. -- 2.30.2